From 388b14515a350513a43f2a257f27ae0204787c8f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 29 Jun 2007 18:41:23 +0000 Subject: [PATCH] Enable SSL support. (#451070, Vince Busam) 2007-06-29 Matthias Clasen * modules/printbackend/cups/gtkcupsutils.c (_post_check): (_get_check): Enable SSL support. (#451070, Vince Busam) svn path=/trunk/; revision=18293 --- ChangeLog | 5 +++++ modules/printbackends/cups/gtkcupsutils.c | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index b7d8e78c40..ac28a7a45a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-06-29 Matthias Clasen + + * modules/printbackend/cups/gtkcupsutils.c (_post_check): + (_get_check): Enable SSL support. (#451070, Vince Busam) + 2007-06-29 Johan Dahlin * gtk/gtkbuilder.c: (gtk_builder_finalize), diff --git a/modules/printbackends/cups/gtkcupsutils.c b/modules/printbackends/cups/gtkcupsutils.c index d5a6bab012..faf369347a 100644 --- a/modules/printbackends/cups/gtkcupsutils.c +++ b/modules/printbackends/cups/gtkcupsutils.c @@ -847,13 +847,14 @@ _post_check (GtkCupsRequest *request) return; } } -/* TODO: detect ssl in configure.ac */ -#if HAVE_SSL else if (http_status == HTTP_UPGRADE_REQUIRED) { /* Flush any error message... */ httpFlush (request->http); + cupsSetEncryption (HTTP_ENCRYPT_REQUIRED); + request->state = GTK_CUPS_POST_CONNECT; + /* Reconnect... */ httpReconnect (request->http); @@ -863,7 +864,6 @@ _post_check (GtkCupsRequest *request) request->attempts++; goto again; } -#endif else if (http_status != HTTP_OK) { int http_errno; @@ -1035,13 +1035,14 @@ _get_check (GtkCupsRequest *request) "Can't prompt for authorization"); return; } -/* TODO: detect ssl in configure.ac */ -#if HAVE_SSL else if (http_status == HTTP_UPGRADE_REQUIRED) { /* Flush any error message... */ httpFlush (request->http); + cupsSetEncryption (HTTP_ENCRYPT_REQUIRED); + request->state = GTK_CUPS_POST_CONNECT; + /* Reconnect... */ httpReconnect (request->http); @@ -1051,7 +1052,6 @@ _get_check (GtkCupsRequest *request) request->attempts++; goto again; } -#endif else if (http_status != HTTP_OK) { int http_errno; -- 2.30.2